Merge changes from topic "am-47d783f4969b4aebbeba9615efda35a7" into...

Merge changes from topic "am-47d783f4969b4aebbeba9615efda35a7" into sc-v2-dev-plus-aosp am: 649326e4

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

Change-Id: I2ffa5d838c6f69232ca1dc78f638c6ec2c9c40cd