Merge "Inject last location in InjectBestLocation VTS test" into pi-dev
am: 8d555ac0a4

Change-Id: Idc8c85f59d210c4897d6e8e9ea293b3a9ed5811b