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

Merge changes from topic "presubmit-am-e2e0a85d5c2447e486904f5bd3376c69" into tm-mainline-prod am: b1887b52

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



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