Merge "Fix the ActivityManagerTest#testTrimMemActivityFg on low mem pressure" into stage-aosp-sc-ts-dev