Merge changes from topic "presubmit-am-5fd34e1f58044cf4a175d5b16b26a765" into...

Merge changes from topic "presubmit-am-5fd34e1f58044cf4a175d5b16b26a765" into tm-mainline-prod am: 0b08f365

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



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