Merge changes from topic "scdevbug" into tm-dev am: 598e208a am: 95507b81 am: f07f5bd3

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



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