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

Change-Id: I978f68dbc6553b59677b3d6dd1fec543b099f867