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

Change-Id: If7fbc5a0bdebae13596c5bba8abf343679d6f801