Merge "Update mount values to be consistent with IVold.aidl" am: ddd2a13c38 am: 3fe1ba327b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica39ed0f0f774ecf7d0342b6f79f57e6e1fe1f3c