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

Change-Id: I8e623f3e8493d1147fcf873fb6491e83b2c2edfe