[automerger skipped] Merge "DO NOT MERGE - Add test of fg service notification policy" into pi-dev am: d6313e05c1 -s ours am: 9a7c313ef7 -s ours am: 5b1458087b -s ours
am skip reason: subject contains skip directive

Change-Id: Ie11a27a1b58df8674d862e7e8f086e0073546a8d