Merge "Activate encryption for /data/app-staging folder" am: f99f09eeda

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1435397

Change-Id: If25e0952c877119dcbbb3e2bc7213e0b13dd32c9