[automerger skipped] Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64 am: e52b6cba86 am: 556944ee49 -s ours

am skip reason: skip tag Change-Id I74f20b37d23370e258e7fc7130e28c5312abf46c with SHA-1 0de31fe1e2 is already in history

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

Change-Id: I79fab0b97a30cf0ccf542aaac27ecf840ad3620a