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

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

Change-Id: I029fd1c5e08b9c9ae918eb9ff4df5bb3280d3bc1