am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
automerge: a8f7074

* commit 'a8f70740c495f7d3f47db65bb08ccdb58c52b178':
  Fix NPE in Running Processes view in Apps Settings