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

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

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



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