Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-mainline-prod am: 9b460368

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

Change-Id: I38d28aafe5913e1d1311303875257d0a617d121b