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

Change-Id: Iebb09f068c6e25c4131022b32450666bb75eed60