Merge "Add flags for device aware permission" into main