Merge "Move the test of minimum supported keepalive slots to CTS"
am: 579a99e558

Change-Id: Id8083b442a1ef47c06d5779d460724e07118389b