Merge changes from topic "am-e19faef9-0d37-4b11-814b-b8569c147c5e" into oc-dr1-dev

* changes:
  Merge commit '5f5e49c57e82e5d88193c5d2dfc594a91cb8f1b5' into am-e19faef9-0d37-4b11-814b-b8569c147c5e
  Remove all Android Security tests that require root from CTS.