[automerger skipped] Merge "Fix OOM cache app optimizer flaky test." am: 3adaac8b39 am: 763c40d2af am: cb3cca676a am: 8e1bf85e0f -s ours
am skip reason: Merged-In I63309bc04d86a020ecace1477400552d3fcbe8eb with SHA-1 0b2363923a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959137
Change-Id: I6e32c4fc5a38c17c51e29b4b15a7e55c8ae04fa5
This commit is contained in: