Merge changes from topic "scdevbug" into sc-qpr1-dev am: 367d37a9 am:...

Merge changes from topic "scdevbug" into sc-qpr1-dev am: 367d37a9 am: f4241e62 am: 29eeb2f9 am: 9ae7f4b6 am: 22cec8fe

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



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