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: 5354da66 am: e00632ae

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



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