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

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

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

Change-Id: I0583b0e25a639c6cd57b0f83ff0758e14ba11589