Merge "adbd: increase oom_score_adj for `adb shell`"
am: db9671090d

Change-Id: I728eb8d2ab2e2fe1e06e5aa5681ef57c655184b1