Merge "Refactor runtime hidden API flag from negative to positive" am: 46b4862d20
am: d0f327cc60

Change-Id: Iaa313ddff5b22ed22baa916d931befc7a59090ba