[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "CacheOomRanker-new-features-sc-qpr1-dev" into sc-qpr1-dev am: 78c1e444 am: 39aa6380 -s ours

am skip reason: Merged-In I8e80db2aab338df07f07842131a9d4b55bebd054 with SHA-1 665e91e1 is already in history

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

Change-Id: I5edddb381eb3627a147f794e8b8a1262cb0c170c