Merge changes from topic "presubmit-am-520d38ff82654b0d9174c12d82a80a0f" into...

Merge changes from topic "presubmit-am-520d38ff82654b0d9174c12d82a80a0f" into tm-mainline-prod am: 92bd75eb

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



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