Merge "Don't update oom adj if there is no wakefulness change" into udc-dev...

Merge "Don't update oom adj if there is no wakefulness change" into udc-dev am: 9f5c62cf am: 3d3dec07

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



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