Merge "Refactor hidden API runtime flag from negative to positive" am: 4c6dfb9c5e
am: 0e711f4085

Change-Id: I7cff65d60271414cc2a2370de3b9abfc25f97868