Merge "Adjust visibility rules for migration" am: d938444667

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11729fc13d2f6d3f8426d2225d082c79dd1fb37a