Merge "Make child window inherit the scale of parent" into sc-dev am:...

Merge "Make child window inherit the scale of parent" into sc-dev am: 4a443bc2 am: 1a4a67dc am: 95a8bdce

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

Change-Id: I1882b2ecee2e9e120da1fca72c1eff53ae8d58f3