tree ad277f2d200a4a586ccff4be59c648c5c9b12bc1
parent a056f69a7a4ef67e31fe789b1f06af70fcacd909
parent a81f292a648a476c76671c5e769b304e36cb1f54
author Anton Hansson <hansson@google.com> 1617187537 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617187537 +0000

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