Merge "[automerger skipped] Merge "[Status Bar] Use `defaultDataSubId` flow to...

Merge "[automerger skipped] Merge "[Status Bar] Use `defaultDataSubId` flow to trigger config re-fetch." into udc-dev am: 30864e5b am: 534a31ac -s ours am: e9202a9b -s ours" into udc-qpr-dev-plus-aosp am: 11f47ee4 -s ours

am skip reason: Merged-In I007751b4a6279569311362cd14410f053a6a47f2 with SHA-1 b91c2972 is already in history

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



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