EHR Metrics logic from hotfix `v1-45-rc4` (`v1-45-rc3-hotfix`) (#1051)
EHR Metrics logic from hotfix `v1-45-rc4` (`v1-45-rc3-hotfix`) (#1051)

* DA-1088 update query filtering for EHR Metrics API per request of the dashboard team

* DA-1088 extra filtering to ensure consent counts are correct

all-of-us/raw-data-repository,all-of-us/raw-data-repository,all-of-us/raw-data-repository