Merge changes from topic "bug_223376078_sc" into sc-qpr1-dev am: e3cb6ab2bf am: 5550bcbce4

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

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