Merge "Reset last activated time after auto mode changed" into oc-dr1-dev
am: 13cfb46e41

Change-Id: Ic54dae12f687caf5288ccbf3cd3c842ce4742721