Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev am: 9a1f59b4c8 am: 03451e6ea6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669 Change-Id: I7a7e457f2410cc84917dc7c8483b07b0ea34942d
This commit is contained in: