Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev am: 8167362bab
am: 132263d8f9

Change-Id: Id48f048974d99570cb4d7df73c3cc2f110530f10