Android R Beta 2
Merge "Add METADATA to unicode: UNICODE+MIT=NOTICE" am: feb5dbfc6a

Change-Id: I421b49bb362bd3d3e1d51b12bc9f656c0735fe0e