[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: 73d15e16 -s ours
am skip reason: Change-Id Ia15c3ceb9fc59e7945687536c60ce265ec95781e with SHA-1 37c10f05 is in history
Change-Id: I4de187590933ed19bbb6247900a42895145597c9