Merge changes from topic "presubmit-am-011ce531f02142789237cf1ddf277b47" into...

Merge changes from topic "presubmit-am-011ce531f02142789237cf1ddf277b47" into sc-dev-plus-aosp am: 913d2900 am: 87f4c7f7 am: 5ac41b9b

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

Change-Id: Ifff113003ceea67ddc33ba87333e0f0cf79efd4f