Merge changes from topic "presubmit-am-d42aa9966d86454092249b55f0b30895" into...

Merge changes from topic "presubmit-am-d42aa9966d86454092249b55f0b30895" into sc-dev-plus-aosp am: e3a7a94f am: 58820cbb

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

Change-Id: I785186ca3a69f93981a875c3da22e49b85812f80