am 2d18c60a: Merge "Performance: Activity manager perf unnecessary recalc of oom_adj"

* commit '2d18c60a0b16c4abac54d373731f4b4afc74e283':
  Performance: Activity manager perf unnecessary recalc of oom_adj