resolve merge conflicts of 110b22a3 to master:

Test: Build a local apk and install on a LE watch to check Android Wear
app permissions. WRITE_CONTACTS and READ_CONTACTS are shown separetely.

Change-Id: I657429125146a3aea6074994063a1515bfac6d50