Merge "Update permission APIs for device support" into main