[automerger skipped] Merge "Pass --legacy to aapt2 compile for TeleService" am: 7d34dd1967 am: 0da8354475 -s ours am: c113f96e29 -s ours
am: dfb2535128 -s ours
am skip reason: change_id I8c1fa787302ecb43c0b5bf46f6d2d3f9776dfc54 with SHA1 62fb97c7c4 is in history

Change-Id: Iaedd9562cf0169f2f321bb7d8aee34bce3bbd852