Merge "Fix the ActivityManagerTest#testTrimMemActivityFg on low mem pressure" into stage-aosp-sc-ts-dev am: 490fc93175 am: 8032ca146d am: 771d603294

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15820666

Change-Id: I5cc31d0419393f96622f70d0a0b2d8e9b08d278f