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

Merge changes from topic "presubmit-am-26a6a382dfac41a4a9c6ec4b78bbc581" into tm-mainline-prod am: d24b6438

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



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