Merge changes from topic "presubmit-am-bf2c168d3e474b609f72a06f73ec50e2" into...

Merge changes from topic "presubmit-am-bf2c168d3e474b609f72a06f73ec50e2" into sc-dev-plus-aosp am: 299187bc am: 5b979c44

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

Change-Id: Ia4a4efaf15c678f1bea87566b3de332268574f3b