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

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

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



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