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

[automerger skipped] Merge "Fix ApkLite attribute parsing" into sc-dev am: 46620933 am: 940791eb -s ours

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

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

Change-Id: I488f691f188f78ce2b023e0a8c01c759cf418561