Merge "Remove unnecessary semicolon in NotificationCompat javadocs." into nyc-support-25.2-dev am: 2cf6878c6a
am: bc08e635e5

Change-Id: Icfc0815a91ebc46e802be414332edb5d97153271