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

Merge changes from topic "presubmit-am-d5f746d3f5a042c2874e68e6ef543b23" into tm-mainline-prod am: aa3dbde0

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



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