Merge "Fix EnforcePermission lint false positive on generated interfaces"