Merge "DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66"" into qt-qpr1-dev-plus-aosp