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 am: aac36455

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



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