Merge changes from topic "scdevbug" into sc-mainline-prod am: 1309cfa8 am: c88821b7

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



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