Android O MR1 IOT Release 1.0.14 (5718152)
Merge "CalendarProvider: Remove unused string resource"
am: 88dbaae618

Change-Id: I76bd55ddf580337aedf84fd2a5165f80bdfbabfb