Merge "Query geo description in worker thread to prevent ANR"
am: eb7c287c71

Change-Id: I0df6d788ff5f8794e03324c3dacf337a7a04c36c