Merge changes from topic "presubmit-am-940ae521a29b4031bfde43b5127edf9f" into...

Merge changes from topic "presubmit-am-940ae521a29b4031bfde43b5127edf9f" into tm-mainline-prod am: 8f0d66f3

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



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