Merge "ActivityManager: Allow DiskRead for wrap.sh determination" am: cbcb388d82
am: 9f6dc54c29

Change-Id: Iaf7619a5161ce336316e9fcd395eabe368ad7302