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
Change-Id: Icf1bdcc5da847bd58c21d5e3698e4fc7f28f9f19