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

Change-Id: I7cf0206d215ff2c86960ace91eed92c713698635