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: 45e4cdd8 am: db60b458
Change-Id: I8d75be54140b4082d368706b008fd32058b9551a