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

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

Change-Id: Ic91d76effe4c082118ebf847b11d4d21163a0645