Merge "Fix incorrect magnification border after rotation" into sc-dev am: 9da336b4 am: f99dd7c5 am: 63258254

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909658

Change-Id: I8d7d56957427673dbeca074c376e521ab631909d