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

am skip reason: Merged-In I8e80db2aab338df07f07842131a9d4b55bebd054 with SHA-1 8bd226e3 is already in history

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

Change-Id: Ie71902c5d521b2565a490d5f2d2d76801e5a950b