Merge changes from topic "presubmit-am-0b3a14cce6414288b87eab506ee9a048" into...

Merge changes from topic "presubmit-am-0b3a14cce6414288b87eab506ee9a048" into tm-mainline-prod am: 3a74a773

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



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