Merge "Merge "Add the defination of Intent - WIFI_NETWORK_SETTINGS_RESET_ACTION" into qt-r1-dev am: 82aec2e913 am: 79c44cb22e" into qt-qpr1-dev-plus-aosp
am: dbefde3227

Change-Id: Ie7fe01467dd37a4a7a274fc4b98bbdce4f9c79f1