Merge changes from topic "scdevbug" into tm-dev am: 598e208a am: 696b35c3

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



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