Merge "Make system-signed apps implicitly force-queryable"