Merge changes from topic "scdevbug" into sc-mainline-prod am: 1309cfa824 am: c88821b71b am: 5354da6674 am: e00632ae4d am: aab68ebdff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370 Change-Id: I7ee71977ebeb045786fcfacfaec3f56c6d7a12ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: