[automerger skipped] Merge "Rename hiddenapi config files" am: 74167085c1 am: d53050bd3d
am: 8d8c9b00f4  -s ours

Change-Id: I0a4db0a088683ea939cb150420dc99df77f7bf9b