Merge "Don't hold AM lock during assist data request." into pi-dev
am: 4d270b6d19

Change-Id: I078a3353667dec6895bdf66e768ebc6019d3ef4e