Merge "Fix google-explicit-constructor warnings in system/vold." am: a3bcf26d93 am: 9bf2a320e7 am: 1c1c4edb98
am: 3634db02a4

Change-Id: I4ce806283833c3fe8bcb713726e7fc3c0d087c90