Merge "CDD: Mandate metadata encryption" into rvc-dev am: e6e94cfad4

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

Change-Id: I6556244fe8080cb58d66bd18db27d53b34426ded