Merge "Frameworks: In the kill handler, ensure the logging handler was run"
am: c0ac9e916f

Change-Id: Ica29cdf9a4b17b6cec957093c35b735d64568029