Merge "Add test for system server method sampling"
am: d2408367f3

Change-Id: I55d0cb5c4e3a0041a5951493fb1434e3e641d9e1