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

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



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