[automerger skipped] Merge "frameworks/base/wifi: unpack non-updatable/...

[automerger skipped] Merge "frameworks/base/wifi: unpack non-updatable/ folder" into mainline-prod am: ed663312 -s ours

am skip reason: Change-Id I6e1bd3fe6335b5dbe5f8ffa84a84df6434c95674 with SHA-1 b1e84779 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I194babfff4e9f0371e942e1783b888112fdfcbd3