Merge "Waive AID Range check for upgrading devices launched before P"
am: 4e29cdec23

Change-Id: I3994ef6ad33a1a9c7a3e4f4d4896e2b16dfdce1c