Merge "Fix failure in testUpdateOomAdj_UidIdle_StopService." into tm-dev am: 7f8e1c17 am: d29dc865

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



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