Merge changes from topic "presubmit-am-aa0156d808284b11b80b5fc6b19627ec" into...

Merge changes from topic "presubmit-am-aa0156d808284b11b80b5fc6b19627ec" into sc-v2-dev-plus-aosp am: 4b77a598

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



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