Merge changes I2a999bbf,I632dc41a

* changes:
  OomAdjuster: demote previous process to cached after configurable timeout
  OomAdjuster: skip persistent/system processes in cycle detection