[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 skip reason: Change-Id Iec73f1b50e108d0499da2afb06a8d9dd79e7b2cd with SHA-1 a80a10e56a is in history

Change-Id: Iec29b21bb22cc8dc69ef2d0a557e79e7f5ef6dd3