[automerger skipped] convert LiveTv to aapt2 am: 17850fe0bf
am: d195718c2e  -s ours

Change-Id: I71cc534b85071b587344d10f4b4f8f1e2dc8eb01