Merge "frameworks/base/wifi: unpack non-updatable/ folder" am: 8196aaaaee am: 479da6944f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5679409252b53e4127adb9f1ee48d07ac637fa21