[automerger skipped] Merge "Add new test module for system service with static...
[automerger skipped] Merge "Add new test module for system service with static / final mocking" am: 4247a85c am: af50de07
am: a77a646d -s ours
Change-Id: Ie6fa895cfd7ebb9b08576da753ab20ddd0fc80f0