Merge changes from topic "presubmit-am-30d5e3b252a64882bd8232ecbecd0e04" into sc-v2-dev-plus-aosp am: f93e57c6

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



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