Fix AOSP Mode onResume behavior

Summary:
Only change modes if the switch and feature state are different

Change-Id: I99f2d89a7f69d694f5b57f1fbf4d41697bda1d2e

Test Plan: fixes derp, test if desired

Reviewers: synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D318