Merge "Document public alternatives to greylisted APIs"
am: 3647eb620b

Change-Id: I20290caeb2b2ef5dbf4ad09715c331e9a6504f77