[automerger skipped] Merge "Allow priv_app to search apex_data_file and read staging_data_file" am: 7b9d03c1b2 am: 8182ca9591 -s ours

am skip reason: Change-Id I14116f02f3d3f0a8390f1d968a3971f15bd4b3f2 with SHA-1 89d43a51ba is in history

Change-Id: Ic3ae21012b4d106d20d9d1ebc6bddda110fa617c