Merge "Don't disable GPS in Doze until the device is stationary." into qt-qpr1-dev
am: 858b68330d

Change-Id: I13305fa7f2c7ee70d9ba925456ac2046ae4424c4