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

Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-mainline-prod am: e07e667d am: 69dbdb07 am: 503d8bb0 am: e724056e

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



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