Merge changes from topic "presubmit-am-26f7ae1ebb424252a10fa1c89b8f1f2d" into...

Merge changes from topic "presubmit-am-26f7ae1ebb424252a10fa1c89b8f1f2d" into tm-mainline-prod am: 2ed50206

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



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