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

Change-Id: I32c785986a97e1a6fba8db94957ae9cdf32c5f15