Merge "Use the try catch to deal with the StaleDataException." am: 1fa847ad64 am: 15698dd32d am: 4b16237ab7

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

Change-Id: I3013edfee1921ce0dce503355d0c866e345e7538