Merge changes from topic "presubmit-am-0ed6b6d049194c9aad1e4d062eecd755" into...

Merge changes from topic "presubmit-am-0ed6b6d049194c9aad1e4d062eecd755" into tm-mainline-prod am: b5a7c1d7

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



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