Merge "Merge "Add permission requirement" into rvc-dev am: 2ea259c0 am: 1d332c56 am: ede180ae" into rvc-qpr-dev-plus-aosp