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 am: 757ee6ed -s ours

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

Change-Id: I0175d8badbe3aa6b77425262d8f3dfcaa0ca87c5