Merge "Silence some caught exceptions if from test app" into ub-contactsdialer-h-dev am: 00e3830122
am: 29d8eec4cb

Change-Id: I2c8263943aed934786007bf1289d4b8019ba53fb