[automerger skipped] DO NOT MERGE Revert "Adding the privacy chip to the...
[automerger skipped] DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am: a6c1e6ab am: 77d97649
am: 465084f0 -s ours
am skip reason: subject contains skip directive
Change-Id: Icba21cf39968e26eeb7f46b5647340374ec309ec