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

Change-Id: Id7323d1d2fec217dbbe5ff12fdc8af9e571ca322