Merge "Change filter logic to allow Context Hub owners" into main am: 1a4cdb3313 am: 68a9d845e4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3337033

Change-Id: Ie4b1c16a2c8126a0ad49bc5c9aa8e0d93a186009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>