Speed up e2e device keys queries for bot accounts#16841

erikjohnston merged 2 commits intodevelopelement-hq/synapse:developfrom

erikj/perf_e2e_devieselement-hq/synapse:erikj/perf_e2e_deviesCopy head branch name to clipboard