Merge "AAPT2: Allow <protected-broadcast> and <eat-comment> in AndroidManifest.xml" into nyc-dev