Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-mainline-prod am: 2cd730a3

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

Change-Id: I87e035f8faade84ed2540b6fac2b386d928396e0