Merge changes from topic "am-6841552f7eeb45e8b2d8ebb26920bd3a" into rvc-d1-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Add setting for power menu in lock screen privacy" into rvc-dev am: eab14fca am: 6023697b
[DO NOT MERGE] Add setting for power menu in lock screen privacy am: 2095c43a am: d8a46445