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

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

Change-Id: Idd14cc43fcd37c7f897e61cf7cddb0fed2b38d67