Merge "Merge "WearMessagingApp: Add missing Gradle files" into oc-dev am: e25da370 am: d5586c0f am: 3698b234" into oc-mr1-dev-plus-aosp