Merge "Add roosa to ONWERS" am: ee1693c4f8

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

Change-Id: I33d65fde45bfd72ee21f704532a2b09ad9c73df1