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: 17b78d95
Change-Id: I8803b9b6d7c9032f17c778aed162df5371f68b54