Merge changes from topic "presubmit-am-ef5db8e2898a45eda2a6aebe542805fb" into...

Merge changes from topic "presubmit-am-ef5db8e2898a45eda2a6aebe542805fb" into tm-mainline-prod am: dae574ec

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



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