Merge changes from topic "presubmit-am-8b92d80a5ddc4f80a73dac54933ad702" into sc-qpr1-dev am: 4e85f7c33d am: 8b16158397

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

Change-Id: I5e73050ec686db6e724173201df488ea00262810