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

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



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