Merge "Allow <adopt-permissions> tag in manifest"