Merge changes from topic "presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-qpr1-dev

* changes:
  [automerge] isDataOrObbPath blocks access to Android/[data|obb] dirs only 2p: bb4ec053ea
  isDataOrObbPath blocks access to Android/[data|obb] dirs only