am 0eec8948: am 305bcbf0: Decrease PackageManagerService wait time for vold

Merge commit '0eec8948f89c5216464d8204cadd69d7a6ec3669'

* commit '0eec8948f89c5216464d8204cadd69d7a6ec3669':
  Decrease PackageManagerService wait time for vold