Merge "Add EXTRA_STREAM to ComponentCaller#checkContentUriPermission" into main