Merge changes from topic "presubmit-am-1818a89739a448418e0c5e26a456a077" into...

Merge changes from topic "presubmit-am-1818a89739a448418e0c5e26a456a077" into sc-dev-plus-aosp am: 130c34ac am: b7ec6d26 am: 9a463bff

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

Change-Id: I2d0c4c19530954775e475b7c36e8a6e38ea32f38