Merge "More APIs on hidden API light greylist / vendor list" into pi-dev am: c931a9f315
am: d19d187dfa

Change-Id: I6d051876dad825ede36fff2a703e6529715c3b57