Merge "Update enabled networks entries on rotation"
am: eaa79b2866

Change-Id: I04ef0aac2857e40412870b310f16b3d6b137f17e