[automerger skipped] Merge "DO NOT MERGE - Added reset geo-fencing checking after airplane mode support" into qt-qpr1-dev
am:5403049225-s ours am skip reason: change_id Ifa3de1576f23f68b040c8473bc79b4bf5a5f7261 with SHA16711cc80ceis in history Change-Id: I79e54d03e944eced9dde3d1933372da1306c6b23
This commit is contained in: