Merge changes from topic "presubmit-am-0ba418188bf14da5b3177de2f43d7187" into sc-mainline-prod am: bc395d52

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

Change-Id: I80c61c673b76001b5cbbb785a3813bac5006b98c