Merge changes from topic "presubmit-am-196349f6d992411bb2e43461f2f0acaa" into...

Merge changes from topic "presubmit-am-196349f6d992411bb2e43461f2f0acaa" into tm-mainline-prod am: 4d41d1ae

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



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