Merge changes from topic "presubmit-am-0adaeb1d15a7491689c8c569dbba8db2" into sc-qpr1-dev am: f86c8c5d

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

Change-Id: I7d00d9a98f981206a5ffae06c10533079392ac3e