[automerger skipped] Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64 am: e52b6cba86 am: 556944ee49 -s ours am: 1a737c45cc -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: I41e22ef24667eb4d2d53f2b865969d91a7ee4d78
This commit is contained in: