Merge "adbd: increase oom_score_adj for `adb shell`" into pi-dev