[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: I29a7b2dfac8e0efab9497d27af8aa8847feb3e92