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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I904fc7ce0de68c03d629b4af4eb0ff9d3258198a