Merge "Remove write type from GATT descriptor writes (3/4)" am: 8e9bc1bb9e
am: 63b880fb8c

Change-Id: If9d04965fcf1dcdfad8b0846a75ef375be930cba