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

Change-Id: I20537eb07184d070a73f6c8e2155687d2bc1280f