Merge "Update visibility rule" am: da9f80a4f2

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

Change-Id: If437380462ec24cf5313885491f57c7454885170