Merge "Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043  -s ours am: beb14f16fd am: c13e51f734" into oc-mr1-dev-plus-aosp
am: d841868feb

Change-Id: Idb571ac087bce60c175b6a54bd52be198bc3c40e