Merge changes from topic "scdevbug" into sc-mainline-prod am: 1309cfa8 am:...

Merge changes from topic "scdevbug" into sc-mainline-prod am: 1309cfa8 am: c88821b7 am: a380b898

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



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