Merge "Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev am: 9585680167" into oc-mr1-dev-plus-aosp