Merge "Catch SqlLiteException if database query throws an exception in CalendarTracker.java" into rvc-dev am: c4568caf2c am: 6dc2cb6a43

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11811067

Change-Id: Ie8f3957b4cdd5b8e11a425b3e67fa4c49e393a4e