Merge changes from topic "switch_uid_owner_map_api"

* changes:
  Switch previous and new code path in replaceUidChain
  Switch previous and new code path in setUidRule
  Switch previous and new code path in removeUidInterfaceRules
  Switch previous and new code path in addUidInterfaceRules
  Switch previous and new code path in updateUidLockdownRule
  Switch previous and new code path in addNiceApp
  Switch previous and new code path in removeNiceApp
  Switch previous and new code path in addNaughtyApp
  Switch previous and new code path in removeNaughtyApp