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

Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev am: d9bacad8 am: d0b38714

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

Change-Id: If8e82fda958489ce4be9a8bd5709ad5c73836baa