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

Merge changes from topic "presubmit-am-a3bd4951382d48b280e66473338b8997" into tm-mainline-prod am: 4447fa4b

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



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