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

am: 35505f61a4 -s ours
am skip reason: subject contains skip directive

Change-Id: I16996eced1fb1be735c2ed83fc518a5ddca3742c
This commit is contained in:
Rahul Sabnis
2019-11-20 10:44:17 -08:00
committed by android-build-merger

Diff Content Not Available