Merge "[DO NOT MERGE] Add setting for power menu in lock screen privacy" into...
Merge "[DO NOT MERGE] Add setting for power menu in lock screen privacy" into rvc-dev am: eab14fca am: 6023697b am: b315bfd4 am: 8855220b
Change-Id: I8ad3c6bc9ce7623ed58d07174a96a1f8e5cd9bd1