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

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

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

Change-Id: I3a98f6063e6d0b288d083e3b61b716a9eab9a9a3