Merge changes from topic "presubmit-am-bf2c168d3e474b609f72a06f73ec50e2" into sc-qpr1-dev am: b0db165d7d am: 173beff9b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898290 Change-Id: If1b04a4a2266e9985174cb9353fcc6726645adb7
This commit is contained in: