Merge "Merge "Federate platform docs against support library API file" into stage-aosp-master am: 4ede13e1 -s ours am: e8bb6023"