Merge "Add DPC, FILTERED and ENFORCE_MANAGED URI in TelephonyProvider."
am: a833c9c68f

Change-Id: I4dc48bd100b4a4b9a6121852a910347722d711c1