Merge "Added VTS tests for clearing operation slots after service death." am: fd877b5479
am: 2b3640a442

Change-Id: I24581b6427c87c6568ecee78282de2b0ed632dcf