Merge "Document public alternatives to greylisted APIs" am: 9057a3dff0
am: 27695e515c

Change-Id: Ica61c0a1d27966893d99de4a4963b182bfe036e3