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

Change-Id: Idb6c8c7b62fd2744da63ea18d35a6d2847eae109