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

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



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