Merge "Remove default network recommendation provider." into oc-dev
am: f37f1f199c

Change-Id: I7cc1d9cbc1d22fa6896ebf14d27b06efcac19b23