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

Merge changes from topic "presubmit-am-a4a19a7ff98b4684a251eb77e61ed0b8" into sc-qpr1-dev am: 944bef82

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

Change-Id: I0d4bd27054833f776fb1776d0c1de7606e7e9a8f