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

Change-Id: I13f47ed986756933172886d7e0c9b5d653fc34e7