[automerger skipped] Merge "Add new test module for system service with static / final mocking" am: 4247a85cdb am: af50de07c3
am: a77a646d94  -s ours

Change-Id: Ie6fa895cfd7ebb9b08576da753ab20ddd0fc80f0