Merge "Add entry to hidden API greylist"
am: e860c63891

Change-Id: Ida418e2e44a2ac4d4ffd036c75a740af51f73cb5