Merge "Refactor runtime hidden API flag from negative to positive" am: 46b4862d20 am: d0f327cc60
am: 2c426bc3f4  -s ours

Change-Id: I2451fc3c54cab4c1aa1d426e2e45e4bf8a550880