Merge changes from topic "presubmit-am-26c0397313d2451caba69c018e522693" into...

Merge changes from topic "presubmit-am-26c0397313d2451caba69c018e522693" into sc-qpr1-dev am: afb2230e am: 5a0f5b50

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

Change-Id: Ie00c0f688e62b9e5e96b6b140373262f5fd3b393