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