[automerger skipped] Merge "Update visibility rule" am: da9f80a4f2 am: 43749fb109 -s ours am: 7dab9146a7 -s ours am: 9ea4831d1b -s ours

am skip reason: Change-Id I894b233cf3a7d5c1a21cc630a08336c43eb79124 with SHA-1 9337f36195 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1351447

Change-Id: I8538d5d870a2cc3efd0f64f18bd16d61805c55cb