Merge "Fix location parsing accuracy" into oreo-cts-dev
am: c84bc64c19

Change-Id: I9956a39f27826a98f8ea7f734f3af372c37c9417