[automerger skipped] Merge "Keep warming services out of cached adj" into...

[automerger skipped] Merge "Keep warming services out of cached adj" into rvc-d1-dev am: 56bab142 am: d140bd22 -s ours am: 61d441e2 -s ours

am skip reason: Change-Id I062f5ec3947ad3acebcc2ffe79e420beb23443a2 with SHA-1 f76c853a is in history

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

Change-Id: I521e00f56f265517af17e014f60aff92e9d27d57