Merge "Allow setting oom_score_adj for services spawned from init" am: b7aef300c4 am: 5969a3f780 am: 25e26708f6
am: 558217ed43

Change-Id: I6c99e6fd7fa69745363644e91147556c6b903f13