Merge "[automerger skipped] Merge "Modify aspects of the phone sysui which is...
Merge "[automerger skipped] Merge "Modify aspects of the phone sysui which is not relevant to car sysui" into rvc-dev am: eab08c2c am: 4087415d am: 7bd2ad81 -s ours" into rvc-qpr-dev-plus-aosp