Merge changes from topic "presubmit-am-01a5e579a8c54e84a6f02bb53e4352e3" into sc-mainline-prod am: 6eb1c70f

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

Change-Id: If637a5f2952a2829baae305751080035ab94eb9c