Merge changes from topic "presubmit-am-22095588cfca4cccb6de704ccd95f743" into sc-qpr1-dev am: 50f10204 am: e1ae637d

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

Change-Id: I410d98276eac780285cfc32aac08c27e3afdc1ee