am 8b6d5b6b: Merge "Clear binder id when determining external storage state" into mnc-dev

* commit '8b6d5b6b6ac3c363ad7aa36873dec1701d33de1e':
  Clear binder id when determining external storage state