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

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