Merge "Update Notifications sample - prep work for Kotlin version" into oc-dev am: a9acc1be am: f60c0ece am: 8ac70f74 Change-Id: Ic76d42454c1b8c0c277ea1ba05eebbe878544853