Merge changes from topic "presubmit-am-892bfeed2a87403cb4f8a1675e774b12" into sc-qpr1-dev am: da88ad66

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

Change-Id: I640265e8a5a7474c88b11cbba6bf97a5e2376482