[automerger skipped] DO NOT MERGE: Add SystemUI support for front-facing...
[automerger skipped] DO NOT MERGE: Add SystemUI support for front-facing camera protection am: 6075dd7f -s ours am: 3ea1f90f
Change-Id: I9d37a7f39839e5fd72541889b5de406da13fc2f6