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: edf460ba

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



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