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

Change-Id: I77b1f28cb33b75029e95ef4d68fa488d8a3e96c4