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

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

Change-Id: I8ae2dd0f42af5b7045fed433c53477c4ef92fef7