Revert "cleanup: Rename and clarify some status bar icon tint me..."

Revert submission 34529017

Reason for revert: Droidmonitor created revert due to b/432771990. Will be verifying through ABTD before submission.

Fix: 432771990

Reverted changes: /q/submissionid:34529017

Change-Id: Ib84da6e817647bd4a03cafc9e522b0d3c9e0edb0