Merge "Use stub-annotations to provide NonNull for hwbinder-stubs-docs"