Merge "Add more OWNERS to DefaultPermissionGrantPolicy"
am: 6b0c47b2b8

Change-Id: I88cf381e33d08227d2312defe8a934f87b1bba47