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: 826fef0a am: 4ecd85ac am: bdf769a5

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



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