Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into sc-qpr1-dev am: 33d52c3d am: 217c452c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15915585

Change-Id: Ib4bb061c363db1a0aac545fba9cc2e90f345c78e