Merge changes from topic "scdevbug" into tm-dev am: 598e208a66

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

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