Merge "[DO NOT MERGE] Fix silentfeedback error" into ub-contactsdialer-h-dev
am: ccf0cf5769  -s ours

Change-Id: I0b86334ae40bb2ba0a74a386becef3af89134edd