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

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

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