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

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



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