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