Merge "Fix FrameSequenceDrawable scaling with circle mask" am: a59975d9 am: 93980c69 am: 4bfb1bb1 am: d524ece4 Change-Id: Ia420541827701e88a662e71bcc3f3571b0fef0d6