Merge "Fix swapped backup/heavy oom adj labels" am: e816d004 am: 66243c93 am: 391b7b41 am: 11bf501d am: faf7e29c

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



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