Merge changes from topic "am-5ee51dfd215444118ff048c30c03c94c"

* changes:
  [automerger skipped] Merge changes I5bab7728,Ie386672c,I04940599 into udc-dev am: 6a6c1dc7 am: 66890957 -s ours
  [automerger skipped] OomAdjuster: use oom_adj_score tiers for cached apps am: 326c51d7 am: 1ffffe35 -s ours
  [automerger skipped] Reland OomAdjuster: demote previous process to cached after configurable timeout am: e2219799 am: d9746ad4 -s ours