Merge "Merge "Cherry-pick from master: AAPT2: Fix JavaDoc first sentence extraction." into oc-mr1-dev am: aa6f03639a" into oc-mr1-dev-plus-aosp