Merge "Merge "Fix per app GPS power usage." into pi-dev am: da4c54e9da" into pi-dev-plus-aosp
am: df34735c50

Change-Id: I7ca08692d661c56cedf3548c5d557472e7b16caf