Merge "Update Notifications sample - prep work for Kotlin version" into oc-dev am: a9acc1be am: f60c0ece am: 1a027451 Change-Id: I669d265692e12ced1f56417b63628e60606a0319