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

Merge changes from topic "presubmit-am-26c0397313d2451caba69c018e522693" into sc-mainline-prod am: 88d65048

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

Change-Id: I4922c861d0bca82634f0461ce3e4c8f65dbc1c5f