Merge "Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev am: 6ce17fb072" into nyc-mr2-dev-plus-aosp
am: 0979227c6f

Change-Id: I4c9b5f67ac5c98b00f7c114dbc506b9062d9dbe3