Merge changes from topic "presubmit-am-94a561089c1a4d33b7bc5d6586457e84" into sc-v2-dev-plus-aosp am: 6e68c71f

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



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