Merge changes from topic "presubmit-am-8eede051c5d84583868b44f7dd92ffd1" into sc-dev-plus-aosp am: e9c50653

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

Change-Id: Iecd5746d39c14724f07609bfb2387902b8dbf4b8