[automerger skipped] Merge "DO NOT MERGE - Added reset geo-fencing checking after airplane mode support" into qt-qpr1-dev-plus-aosp
am: 34644e5568 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1b2b4c0a26d64571aa5c92bb9677ac82593c20e