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

Change-Id: I85e4aef4ebeb9735dfb17726c8290d2f58a0db09