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

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



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