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

Merge changes from topic "presubmit-am-e88e500f86814d2f8fe7183449e4e5ce" into tm-mainline-prod am: 3233e0f4

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



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