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

Change-Id: If7d985447f33ae8361e8db8efc3b38689af0d1cd