Merge "Add entries to hidden api greylist"
am: 7d044566c6

Change-Id: Id7966477ee57cd3a8d3b02c4772b6a572e3f5f1a