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

Change-Id: If063ff023bf386884c6e42d2acb281763975ac8f