Merge changes from topic "presubmit-am-011ce531f02142789237cf1ddf277b47" into sc-mainline-prod am: 9ab3a8828c

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

Change-Id: I3cba871a5a3541460a9ab3a9a3f7660b413e2fd5