[automerger skipped] Merge "Pass --legacy to aapt2 compile for DownloadProvider" am: eda6814cc2 am: a7c1ef78f5 -s ours am: 4e1fc23547 -s ours
am: 17b8f4f1ad -s ours
am skip reason: change_id Ib887cf802f411e7ebef119f39a7faedadc6a2f6f with SHA1 f339296414 is in history

Change-Id: Ie69fcff2caf9239acb642727e66ecfa914df9142