[automerger skipped] Merge "Fix ApkLite attribute parsing" into sc-dev am:...

[automerger skipped] Merge "Fix ApkLite attribute parsing" into sc-dev am: 46620933 am: 8ee5ab57 -s ours am: 5e46cfeb -s ours

am skip reason: Merged-In I6c7014e5dae0f6f15268f0271c133879a89f5bc7 with SHA-1 e319e3ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14603261

Change-Id: Ib66a71a531edf4467f14965f27851a93c8389347