Merge "Add roosa to ONWERS" am: ee1693c4f8 am: cb4ed8dcc4 am: 0857ac2716

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

Change-Id: I8053df03f61f295408311d92b86f5f74393de9f9