Merge changes from topic "presubmit-am-bb4a824ed94f498799af04d5ca2829b8" into sc-qpr1-dev am: 2e5b8ba1

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

Change-Id: Ibbe953184956a054dcb6572a31571b104c69129a