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

Change-Id: I461a9af181d4a69658b41a12a7f974792f5cad2d