Merge "Waive AID Range check for devices through Q"
am: c46cc7d83d

Change-Id: If394d361d680798e337868d92a3c0ce01df57cd9