[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am: ed1f171cb9  -s ours
am: dd540c644f  -s ours

Change-Id: Ie2115a3f82b78a632dec2c85527755bcb667253a