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

Merge changes from topic "presubmit-am-b2dcf94a336a41e18a9370da4e132cfa" into sc-qpr1-dev am: 27c44233

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

Change-Id: I5054c30c30b2ffff1cc48eb8d314b01db8e349a4