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

Merge changes from topic "presubmit-am-b2e291a416ff4d26ae9b9ac0b0a7cf6e" into sc-mainline-prod am: 7ebd227a

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

Change-Id: I8c76f25b803191e102e045b06d39d36ee9c22b1c