Merge "Ignore testGetFromLocation for InstantApp" into stage-aosp-tm-ts-dev