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