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

Change-Id: I643d72851abafc1530cb3b4d3b23fabc09b18f51