Merge "Add entries to hiddenapi light greylist" am: c00b9bcf8d
am: e515c95f6c

Change-Id: I1b9d07eb9abfca468fb130b00775032112864f67