Merge "Add cleanup method to FalsingManager to prevent memory leaks." into qt-dev
am: f0fb6e1b29

Change-Id: I685932b655a204abe41d69921ef16d399e873b56