Merge changes from topic "presubmit-am-34bbef0f4bf04e02ac6082d10b45a7e9" into...

Merge changes from topic "presubmit-am-34bbef0f4bf04e02ac6082d10b45a7e9" into sc-v2-dev-plus-aosp am: 9cd00f77

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



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