[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: 21c84b61 am: df4c16d7 -s ours

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

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

Change-Id: Ib5f9d7f65d2673f03afe48de0a604604aaf51f55