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

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

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

Change-Id: Icb76c4747e1a34c0ef711818a25c9e376f561469