am 0a216235: Merge "Add UID isolation CTS test." into jb-dev

* commit '0a216235ac0038c13051a8080046d061f9daf3fd':
  Add UID isolation CTS test.