Merge changes from topic "presubmit-am-783b8bfb739d4097b46f70a449eed162" into...

Merge changes from topic "presubmit-am-783b8bfb739d4097b46f70a449eed162" into tm-mainline-prod am: b0d51cb3

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



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