[automerger skipped] Added reset geo-fencing checking after airplane mode support am: e7591d360b am: 3ef1d37758
am: 0c9e1f4307 -s ours
am skip reason: change_id Id54bc210958ddf440efea5c3e042e33ba6936a29 with SHA1 7afa1c0dca is in history

Change-Id: Iad0f242829aa614e339f598b2d602f93cf37bbf7