Merge "Rename hiddenapi config files"
am: 74167085c1

Change-Id: I551b6d6b20896b39411575490b000d5a39df4d84