Merge changes from topic "presubmit-am-186284b4dfce4c8293a0a492c43ee345" into...

Merge changes from topic "presubmit-am-186284b4dfce4c8293a0a492c43ee345" into tm-mainline-prod am: 13013b7d

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



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