Merge changes from topic "presubmit-am-0550843f1444420ab16f47a7d2ecee97" into sc-dev-plus-aosp am: 5b2b28a5 am: bcc86ede

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

Change-Id: I87180b738cf890112eac0cf3665d242a833bf027