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

Change-Id: If584fabf576841b41a52df2c0c9538a6d4262dd3