[automerger skipped] Merge "RESTRICT AUTOMERGE: Add android.intent.action.LOAD_DATA for Google Play" into pie-cts-dev am: 02bcf87ee0 -s ours am: 1428657985 -s ours am: 7ad6fc7775 am: 47e7d88a11 -s ours
am skip reason: subject contains skip directive

Change-Id: I338a8a4dd01fa255f9bb46f33c8948b28c839cb2