mergeup: fix aospa remote name
Change from pa to aospa

Change-Id: I5ea9882ac71ad6786a4bef1c87d0bd7c2d8a2f3a