Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into...
Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev am: d3dc9171
am: 63e3339e -s ours
Change-Id: Ia75813944b333f258e37cfa1d700e619bd6b4c41