Merge "CTS: allow continue to use the old AIDs on devices launch with P" am: 8828e8ba am: ecb0c06a am: ed686643 Change-Id: Iad289250b79151b9c62ff881e6773bc9ffd1fc8e