Merge changes from topic "scdevbug" into tm-dev am: 598e208a am: 483c71ce

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



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