Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev
am: f7d650e89a

Change-Id: I740ffa8fe5a8a797f7c0dbce0a8af7a83248bd56