Merge "Allow setting oom_score_adj for services spawned from init" am: b7aef300c4
am: 5969a3f780

Change-Id: I639c4b51a8cf6fa466832e1c53827f30e4393e21