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

Change-Id: Ia14fb9b3d20f0f0304232c816c0546a71ece15a1