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

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

Change-Id: I655d780abc7fefe7f0b58a195d6cd602d81ea339