Merge "Handle multidex in LocationIsOnSystemFramework." into pi-dev
am: 7d1dbae1f2

Change-Id: Ifd286e9202447a1c495617c82b57d69f2d5d912d