Merge changes from topic "presubmit-am-7600ce26d35c4e57aac5d98a83d07b5c" into sc-mainline-prod am: d3d72073

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

Change-Id: Ibaa8bd48c3b323e73ad22b70f30670e7235410b2