Merge changes from topic "presubmit-am-69cae2cb3643424fbdd22aaf28a1c4d0" into sc-qpr1-dev am: 06d9059ca9

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

Change-Id: I7c5cbd20b6b09dd71910c6b3c8643502046e0b96