Merge changes from topic "presubmit-am-86d3b292394544e49980c58589b30bac" into sc-v2-dev-plus-aosp am: 5a9f7133 am: f94e38b5

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



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