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

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

Change-Id: If1e174c0584c849ca1aa2c758d40fa560c123312