Merge "Revert "Explicitly mark receivers as RECEIVER_NOT_EXPORTED""