Merge "Add reserved AID ranges for all partitions" am: 2a0a0810a1
am: 306ca15d79

Change-Id: I68ac1fee59fe52151b7ddc86ccf215c23dbf3911