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