Merge changes from topic "lost-ram-kmd-cma-usage" into main am: 7780e254 am: d7958c57

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



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