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

Change-Id: Ia955fd0d980a5ddcdb5ae6880c7a380251819f44