CDD: Add per-user block-level encryption to storage encryption am: 386f830db1 am: abe74c864e

Original change: https://android-review.googlesource.com/c/platform/compatibility/cdd/+/1786631

Change-Id: I136af006757127e04ac023454ed3a6e190c4a7df