Merge "Refactor runtime hidden API flag from negative to positive" am: 1bd06e1890 am: 01d18a2931
am: 79d50b752f  -s ours

Change-Id: Iefb0fa785ab4d3d8fd7045515d92ef8a674b8fc6