Merge "Update build target names & code location for roleservice.proto usages...

Merge "Update build target names & code location for roleservice.proto usages in framework." into tm-dev am: ff213ef7 am: dd8a7bf6

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

Change-Id: I9909f9ff53e07f2ed72cfd2bcf4e88abdbd5491f