Merge "Add new test module for system service with static / final mocking"
am: 4247a85cdb

Change-Id: I29d5aca15124a910a765d45412a27e2817222703