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

Change-Id: Ic745e09924c76753e52ec76146b00e1814ec0901