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

Change-Id: I50ec8d4b35760ad122b6fa7323e277ec9bba80d8