Merge "Greylist hidden methods for exempting trusted test code"
am: 2a661bff82

Change-Id: Ifccc5e3a86ee91fbaa05553823f6f2348c7dc890