Merge "storage: fix vold selinux error" am: 8d03396991 am: efb0bc358b

Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/2377049

Change-Id: Ia9351d352becf5100d6040deb4da3fd58e8d5f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>