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

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

Change-Id: Ideca46a51dc10255081acc8d8e3045e0039a320b