Merge changes from topic "presubmit-am-8b92d80a5ddc4f80a73dac54933ad702" into sc-dev-plus-aosp am: 61fe5aa1 am: 8a9c1891

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

Change-Id: I2a94e43e1602598f1a52116b02b9594b1216c791