Merge "Rename hiddenapi config files" am: 74167085c1
am: d53050bd3d

Change-Id: I2ad91da21503a5b53e3a11926949950e6e436c96