Merge "Rename manual hidden api lists" am: f6d191c250

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382669

Change-Id: I62b261a0d977b97421293ac4f19221abc25fe6f4