[automerger skipped] Merge "DO NOT MERGE Revert "Merge "Revert "Re-add...

[automerger skipped] Merge "DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b"" into qt-qpr1-dev-plus-aosp
am: 35505f61 -s ours
am skip reason: subject contains skip directive

Change-Id: I16996eced1fb1be735c2ed83fc518a5ddca3742c