Merge changes from topic "presubmit-am-2c552ed4082b47299cc082dea673dc45" into...

Merge changes from topic "presubmit-am-2c552ed4082b47299cc082dea673dc45" into tm-mainline-prod am: e2a3fcbd

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



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