Merge changes from topic "presubmit-am-a4905c0263fe4b63a3e22407af07914e" into sc-qpr1-dev am: ed4d7fd7

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

Change-Id: Ib671713265a64dfe231b8728e15c85f5b58ffb34