Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918b6 am: 7a81b7d5b6 am: 0ad612d397
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311 Change-Id: I5d18c347c85cd11ee8da9619b4643b809381f1f7
This commit is contained in: