Merge "Work on issue #130684057: oom_adj scores for 1P apps are abnormally low" into qt-dev
am: 151675e37e

Change-Id: I0e9039ff33fefb3e17aec73f347b8b11acc9e363