Merge "Set com.android.networkrecommendation as the default network recommendation service." am: 0b4df21aac
am: 4c3b2f5f99

Change-Id: I7ee10f1336c48969fa64cd6f5a45087027a2e8c3