am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

* commit '7cb1dfe690b2d700ce212712287dfd59c2c8e43f':
  Insufficient ProcessRecord cleanup when persistent process is killed