Merge "Add zoned device support" am: 3f9c8a8c3a

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

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