Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-mainline-prod am: 655feee4

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

Change-Id: Ie7bb3cded0533d5757d9ea5cc297b6aebd12fac4