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

Merge changes from topic "presubmit-am-e3bbcfff87754fcd84547062c82f667e" into tm-mainline-prod am: 9112842a

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



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