Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64

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

Change-Id: I2ac5306261e93c99a3a38b1ad0cd9f68525f2ec1