[automerger skipped] Merge "Reference libcore, conscrypt and icu sources directly" into rvc-dev am: c96262a856 am: 9f1bead44e am: c7e090c29b am: 15a6ae3f5d -s ours
am skip reason: Change-Id Ia15c3ceb9fc59e7945687536c60ce265ec95781e with SHA-1 37c10f05d8 is in history
Change-Id: I0b52e44055a218629752d1cdb19963931ecc4ab0
This commit is contained in: