Merge changes from topic "presubmit-am-c36a899a15cc428c9d8f898ef539dfc2" into sc-qpr1-dev am: 58b23faf9e am: 206f49712a am: df516909a2 am: e15dd1ec21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16925818 Change-Id: I47b8a08e4a21ba42f71223f48c444e95e323d4c2
This commit is contained in: