Merge "Fix LocationManagerTest#testGpsStatusListener test failure on fugu/molly/MTK boards." into lmp-dev