Merge "Fix ResolverActivity don't show items" am: e251bb72ed
am: 7fd3a8d08b

Change-Id: Ia76b696bcd1ec5763ec3da41fae4c8c2bce9b820