telephony-msim: Fix package errors

Change-Id: I64f0d59812fa6f9b8bd9ad5d9969ba7e352a27ac
Merge remote-tracking branch 'upstream/jb3' into jb3