Merge changes from topic "presubmit-am-89eae4c44d22430cafb16bdf4e262a4d" into sc-mainline-prod am: ed282dd1

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

Change-Id: I3380c66156fb739c56eb55a86d8b64b52ecc1361