Merge "Fix duplicate permission info on Adoptable storage"