Merge "Allow more time to un-blacklist strongest satelite" into pie-vts-dev
am: 23874c7ae9

Change-Id: If9c4a4278b4b447b81f874960bdd5ac4ebb7f030