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

Merge changes from topic "presubmit-am-ac7cacae49d24301abff6b7bd49eaa04" into tm-mainline-prod am: 86c4401e

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



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