Merge "Merge branch 'icu65.1' into aosp/master" am: fc5de11a67 am: aef9df853d

Change-Id: Ifb388d55fabedbed0bbb1df0942d3d30f97d7e53