[automerger skipped] Merge "Add entries to hiddenapi light greylist" am: c00b9bcf8d am: e515c95f6c
am: 208e2f4a13  -s ours

Change-Id: If217ed463d6ee23cfdcabe96c2371a823d6d9349