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

Merge changes from topic "presubmit-am-b160cfb654054cce833ec12a666fab6f" into tm-mainline-prod am: 036b7d80

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



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