Merge "Update vold to log only debug or higher level messages." am: 9bd07d8760
am: 92c182e4c7

Change-Id: I62e7a0c1b2a3cc365e1a693599c15e47e2dffacf