Merge changes from topic "presubmit-am-86e91cffbb564d20a27cb55011174a08" into sc-v2-dev-plus-aosp am: 0d1ce1ff

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

Change-Id: Ie7e47310ace06186be82c69779d4e8fe26f696dc