Merge "Avoid subtracting shmem twice when calculating LOST RAM." into main am: 378aaa057c am: 6a162163b4

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

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