Merge "docs: fixed mistaken reference to NotificationManager" into pi-dev am: 206a50673d
am: bb252836e5

Change-Id: If12876c83c191b91235e16a69d7dad66fc682b80