Merge "Cover framework code in hiddenapi-mappings." am: d39df1d0ac am: ad6cf4a97c am: efd6f89c7b
am: 67044c622f

Change-Id: Ieeacc11c041fa2ce100ce7c2553688b7d3c477d3