Merge "Add visibility rule for migration." am: 447d6af218 am: f1efba5a92

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0495d6b95524907f46a511b781b5119dec502bea