[automerger skipped] DO NOT MERGE - Added reset geo-fencing checking after airplane mode support
am: 78e766ac -s ours
am skip reason: change_id I2d2da2f173f6ed071ad9dfdb95fb04ac9bee3f71 with SHA1 1595a6b3 is in history
Change-Id: I3f90b17231860d646b61839c58413bbdcf1df5b2