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

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



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