Merge "Refactor runtime hidden API flag from negative to positive" am: 1bd06e1890
am: 01d18a2931

Change-Id: I005c176d4d05e11c07cbf603e7170d1185e86dfe