Merge "Fix duplicate permission info on Adoptable storage"
am: b0c6dc309d

Change-Id: Ia89a5faf70c200c08484f48bc7eaa02defb8d012