DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66"

This reverts commit 07c1280421dc715b4f20cf76328c7735d7872986, reversing
changes made to d26ea8807f7337a7e540944921932db9277b46a7.

Bug: 144619932
Test: Manual
Change-Id: Ie9a46c9527004759a250dc71d2a1065ff3bb7328
1 file changed