Revert^2 "Clean up PLUG_IN_STATUS_BAR_CHIP flag"

01bd16a5a37763dedb2c1a83a69ab6cfb8af89be

Change-Id: If5fbbe60b5153f000dd8a1066f30a1482312980a
10 files changed