Merge changes from topic "presubmit-am-9e02ec8a58b8494cb28f4604088edc86" into...

Merge changes from topic "presubmit-am-9e02ec8a58b8494cb28f4604088edc86" into tm-mainline-prod am: bea8dd56

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



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