Merge changes from topic "presubmit-am-fbfa3bdd2cb9460bb4af78a6f252a34b" into sc-qpr1-dev am: 3143908a am: 905bdbd0

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

Change-Id: I14cb4035093a4c1c04254fee42ef7efdb4c2b5c9