Merge "Handle multidex in LocationIsOnSystemFramework." am: 9d93cd6518
am: 7eae994c4e

Change-Id: I636deb4178627265a57c62875611a47ad2c6b43c