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

Change-Id: I58765b1b54d66f99673c2dd681e2b943350853c6