Merge "Fix swapped backup/heavy oom adj labels" am: e816d004 am: 66243c93

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



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