Merge \"Fix a broken case of AndroidKeyStoreProvider error logging\" into nyc-mr1-dev
am: 45b8216d33

Change-Id: I774014fc4922f10a5fd0b23239b0a5710a4f3f3c