Merge changes from topic "presubmit-am-32e2c779af8e471d8194e76b9c62c0ce" into...

Merge changes from topic "presubmit-am-32e2c779af8e471d8194e76b9c62c0ce" into tm-mainline-prod am: 02a2da75

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



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