Merge changes from topic "zram_maintenance_support_check" into main am: a0a129fc am: 7544e55f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3465212



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