[automerger skipped] Fix visibility rule. am: 1f9ca72364 -s ours

am skip reason: Change-Id If00767d0fefb35bba8633a594a0e5b26b2e64e12 with SHA-1 ab93bef800 is in history

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

Change-Id: Ie08d1d17d7f70aa1e8d89c88757f25bdbc7af053