Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into...

Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into sc-dev-plus-aosp am: 29362f1e am: cb83eaef am: 7a914680

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

Change-Id: Ic4bd1788f45fc035562cec2b990315e6337c8ff8