Merge changes from topic "presubmit-am-8e43db699b534342af60c58f6478d4bd" into tm-mainline-prod am: 96687b5b

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



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