Merge changes from topic "presubmit-am-695a0670652f409eb2ad65b923b8b42c" into sc-v2-dev-plus-aosp am: 9656668b

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



Change-Id: I666f6de7ec5341188dfc54f6013f9873692bf9fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>