Merge "Keep warming services out of cached adj" into rvc-d1-dev am: 56bab142 am: 21c84b61

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

Change-Id: I30d25fe4337dd17a13367efbe322bd1dc9c2eeef