[automerger skipped] Merge "Force FGS notifications to show for a minimum time" into qt-dev am: e590a7d0b5 am: 9ec959b8f3 am: cbab929395 -s ours
am:833d336899-s ours am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA13ceaa9b957is in history Change-Id: I222a55c751ed1d4eda8aad2e99f508063143def2
This commit is contained in: