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

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



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