Merge changes from topic "bug_223376078_sc" into sc-qpr1-dev am: e3cb6ab2...

Merge changes from topic "bug_223376078_sc" into sc-qpr1-dev am: e3cb6ab2 am: 5550bcbc am: d14fd3d3 am: b65941dd

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



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