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

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

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