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

Change-Id: I5f140507bcb25a87550249898cc7a43417201076