Merge "Adjust visibility rules for migration" am: d938444667 am: ffcaf9ec9e am: 85e84adff4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae102c6ee7f5a6edf39c0fd3eb06386578a8150e