Merge changes from topic "presubmit-am-e3c1888c62794717b02f19ce77d046a6" into sc-mainline-prod am: 38e449b7

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

Change-Id: Ieb7229bb05d0fa60436d0679bb0f0792770efcab