Merge "CTS: allow continue to use the old AIDs on devices launch with P" am: 8828e8ba3a
am: ecb0c06a39

Change-Id: Icd9d2b2a804de2fdd54108a001f9f048998def7a