Merge changes from topic "presubmit-am-8eede051c5d84583868b44f7dd92ffd1" into...

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

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

Change-Id: I3ef71234de33df5743611b34399b55882f0dc7f7