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

Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-mainline-prod am: e07e667d am: 69dbdb07 am: 1bc235b4

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



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