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

Merge changes from topic "presubmit-am-ec42187f28a94a2b87404bbf069323c2" into sc-dev-plus-aosp am: 37b01f83 am: 9b6698ef

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

Change-Id: I4b2ba8c93d43ac867c3522dd532b17c1ce760730