Merge "frameworks/base/wifi: unpack non-updatable/ folder"