[automerger skipped] Merge "Cover framework code in hiddenapi-mappings." am: d39df1d0ac am: ad6cf4a97c am: efd6f89c7b am: 67044c622f
am: e127a473c9 -s ours
am skip reason: change_id I9559346d306499c2f9659b73a68962d640fe644d with SHA1 3cc3fa4151 is in history

Change-Id: Ib7d413fd458bd89e2f79b1676c49e817c47a0691