Merge changes from topic "presubmit-am-b07c53c40c7a488890bf5c1d4084ea9d" into...

Merge changes from topic "presubmit-am-b07c53c40c7a488890bf5c1d4084ea9d" into sc-qpr1-dev am: a8ab77e4 am: 743a8a93

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

Change-Id: I177769b77baf293c85ecc8c7759a329f5cfd83fe