Merge changes from topic "presubmit-am-48e8246e8960485fa279b808afc4be97" into sc-mainline-prod am: 34e94a35

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

Change-Id: I0b510e643f20e7a3089e5d89cdbed03c282ac801