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

Change-Id: I2c4c0a33dfd3eb8551f623fad24a078f51759710