Merge changes from topic "presubmit-am-af083feab1b040fdb322200bf4ef4e5f" into sc-v2-dev-plus-aosp am: cbc3cf83

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

Change-Id: Ic9838ac5f0197c4ac4701970794045d71348ebe1