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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I355197c6f1e9a5e41ad7738b31cc1515718891d9