Merge changes from topic "presubmit-am-24469baaaea546dbbf9bbf95e81771ff" into...

Merge changes from topic "presubmit-am-24469baaaea546dbbf9bbf95e81771ff" into tm-dev am: 2dff7839 am: 8f5154bd

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



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