Merge "Fix ActivityManagerServiceTest and OomAdjustTests." into rvc-dev