[automerger skipped] Merge "Reference libcore, conscrypt and icu sources...
[automerger skipped] Merge "Reference libcore, conscrypt and icu sources directly" into rvc-dev am: c96262a8 -s ours
am skip reason: Change-Id Ia15c3ceb9fc59e7945687536c60ce265ec95781e with SHA-1 5c89e70a is in history
Change-Id: I7377d3c41d6b35fa66c18c8f5fbb756030711b3b