Update package names to make Mms-caf buildable

Change-Id: I9f4ad7130eb8610e69b0fac73567e82e06fd6de6
Fix merge error in TransactionService

Merge error created nested loops for pending/processing transactions.  Fix by
taking CM version of processTransaction.

Change-Id: I5ef3b59a56f98b9fd1a7750add90ca9eec85dd1a