[automerger skipped] Merge "Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am: 5a0b7e59c4 am: 77667ce117" into qt-r1-dev-plus-aosp
am: f8c23c77e0 -s ours
am skip reason: subject contains skip directive

Change-Id: I9cd0936cd0beb38580e6fe38fecabec3d7adc45e