am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev

* commit 'a319d655e336ffb0fcbee65b77926a32660c7f3f':
  Avoid runtime restart after vold reconnects.