Merge "Use isolated uid to set oom_score_adj" into oc-mr1-dev
am: d60e2ede49

Change-Id: I5416ba83137d9983f4c76176c68abd8cf31f696d