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

Merge changes from topic "presubmit-am-d779dce131b641afa9cae2d4523c3036" into sc-qpr1-dev am: 14ea6fbd am: b9cedc7c am: e0fb7403

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

Change-Id: Iac7e44852e86fda803732a8abb537db2923c064b