[automerger skipped] Merge "Don't disable GPS in Doze until the device is stationary." into qt-qpr1-dev am: 858b68330d
am: 0204b63e33 -s ours
am skip reason: change_id I7bc68c8a5e6744aac3a160ac14fc3375f9374d82 with SHA1 810c77d5a0 is in history

Change-Id: Ic1dee8321c0e3e509b43df26eb88c5f762df2446