Merge "Print more information about hidden API accesses" am: 08a5cb2e09
am: ca48c2b8b2

Change-Id: I62f608804c8f7c89cdaa50369c13bb1b981ceb1d