Merge "Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: acb4c9b7 am: d19735f0 am: 0f77cab6" into udc-dev am: b20c2e6a

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



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