Merge "Filter instant app content providers" into oc-dev
am: 3891674204

Change-Id: I4e33d8e82a249249dfe25964cbfdb89b2f1e0318