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

[automerger skipped] Merge "frameworks/base/wifi: unpack non-updatable/ folder" am: 8196aaaa am: 479da694 am: 5931d583 -s ours

am skip reason: skipped by user dysu

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cba8f4c19de76f615860c46566c1569779029fc