Merge "Remove ro.vold.level_from_user." am: c0e870af67 am: 972317ce6d

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1535004

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaac98f9b15152b36560d5188d848228b9eb28267