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

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

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



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