Merge changes from topic "presubmit-am-e1fc50fa0faa4d99aa3c954335c1c49a" into sc-qpr1-dev am: 7a12948386 am: a80eecddef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15899944 Change-Id: Iad9d94e58bc408819dd6fc4c2d701bce4afee2c1
This commit is contained in: