Merge "Fix typo in zram maintenace battery sys prop" into main am: 1bd49074 am: 71dee8cb

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



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