Merge "Add manual CPP interfaces to EXCLUDED_CPP_INTERFACES for @EnforcePermission lint"