[automerger skipped] Merge "Add cleanup method to FalsingManager to prevent memory leaks." into qt-dev am: f0fb6e1b29 -s ours
am: 74ddd19d88 -s ours
am skip reason: change_id I2b52d018d478dbcad4ecb7d8a5b361638d5c5877 with SHA1 4c5a13ebd9 is in history

Change-Id: I4297c4eda9bf0efcd979935c50ea137fa987c221