[automerger skipped] Fix CacheOomRankerTest. am: 500e43dcf5 am: b169174209 -s ours
am skip reason: Merged-In I9facbdaf3b1fe7c91f5e387e7c44a9b1e9be2d6f with SHA-1 500e43dcf5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15684478
Change-Id: I6d628dc829ea51e2d9994caa237cf707681a0841
This commit is contained in: