am bfd7a123: am f5f70b66: Merge "[ActivityManager] Avoid killing unrelated processes."

* commit 'bfd7a1233411c60692797f9824695b90663061bf':
  [ActivityManager] Avoid killing unrelated processes.