Merge changes from topic "presubmit-am-fbfa3bdd2cb9460bb4af78a6f252a34b" into sc-qpr1-dev am: 3143908a am: 1ba32647 am: 435d753f

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

Change-Id: I8e01e5f4bdbb2180df90981d4d00db4adba37a7d