Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-mainline-prod am: d3d18ad3

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

Change-Id: I7811d8e6a5733e959496eefbd3bfb0ab301f3dc4