Merge "Refactor UidRange by using stable aidl structure"
am: 1742c23b88

Change-Id: I9ac52f3869fe051d0ef7f45768f1defad155b53b