Merge changes from topic "CacheOomRanker-new-features-sc-qpr1-dev" into sc-qpr1-dev am: 78c1e444ab am: aaf5f8b90f

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

Change-Id: I71fb6e62e01a18962a7c82b9bf2b120676de657d