[automerger skipped] Merge "DO NOT MERGE - Add test of fg service notification policy" into qt-dev am: 592c76c765 -s ours
am skip reason: Change-Id Iec73f1b50e108d0499da2afb06a8d9dd79e7b2cd with SHA-1 bdcd5c3cb2 is in history

Change-Id: Ib1a5695f9f73fb7997f2a30ddaf6123a77df53f1