[automerger skipped] Merge "Modify aspects of the phone sysui which is not...

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

am skip reason: Change-Id I37e849141cc1ffe2e9bd8b0841ac33901ff845e9 with SHA-1 4764fba1 is in history

Change-Id: If392992181ee86a64b1a17c11f3d7563847521db