Merge "Fix test failure in ActivityManagerProcessStateTest." into oc-mr1-dev
am: 30f675d3b7

Change-Id: I9371ef8014b70150b93cf8491455970d6144ad42