Merge changes from topic "presubmit-am-8eede051c5d84583868b44f7dd92ffd1" into sc-qpr1-dev am: 2d955dd2

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

Change-Id: Ic6b2e79eecec3bec81384f5836b8d20fe445628e