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

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



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