Merge changes from topic "presubmit-am-83614c0b76a14ebc87638664e51ddec9" into sc-mainline-prod am: 77c1233f

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

Change-Id: Ib7bd98c5c04c702e69e58069af87c9be8df498be