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

Change-Id: I24084d13e438eccf5151d966f7807c88a4996ed6