Merge "Fix OOM cache app optimizer flaky test." am: 3adaac8b39

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

Change-Id: I87ba33714762cf848bd84b63de26fecd411596e4