Merge changes from topic "presubmit-am-bbf213f141924072ae886cc03356ffb5" into sc-qpr1-dev am: f6d5da7d28 am: a4aaaf3741
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15860546 Change-Id: Ib57aecfd3800950b487aecc246128cfa2463c8b8
This commit is contained in: