Merge changes Ie7aaec55,I3053cdb6 into sc-v2-dev am: 57a3e448f6 am: efc97e3688

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

Change-Id: I2b90171df59cdbf4514bc4e609f09d98bbabe588