Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into...

Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into sc-mainline-prod am: 946058f0

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

Change-Id: I926aab36e933368d82c112f7c02ba13e3db334f9