[automerger skipped] Merge changes from topic "bug_223376078_sc" into...

[automerger skipped] Merge changes from topic "bug_223376078_sc" into sc-qpr1-dev am: e3cb6ab2 am: 5550bcbc am: d14fd3d3 am: b65941dd am: 7b844959 am: f7543a0c -s ours

am skip reason: Merged-In I35d20539ffac055a6d61260445620f45584bd9c5 with SHA-1 e8979d4c is already in history

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



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