Merge "Enable the BrightLineFalsingManager by default on Q." into qt-dev
am: 0e680785e4

Change-Id: I92f0755aa748e131dea5a9fc5c22d7caecf33233