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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe6c9432ff239e50b11add743b05768b576cd86