[automerger skipped] Merge "Prevent NPE when displaying a missing clock" into tm-qpr-dev am: 4760b7cda3 am: 5277665692 -s ours
am skip reason: Merged-In I17cddba7aee082c118f9f63eaab8a8c025daee73 with SHA-1 2a4d9e5d51 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492509
Change-Id: I7b012767c689b9191646bacc75e226868171d202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: