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

Change-Id: Ifb5fa1acaf223cc9acf6c45de40150848a7c0c54