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

Change-Id: I23957358b0c3d80e595ee43b995b56e96b19e6ee