tree bc3d16cd58370aa3620520cfd9aee1fb373af995
parent 703427e52cad88cff851fd9394d52a186aa348dd
parent 0a2fb51a9eed1541acb0c296daff9ca5bfe7d529
author Jean-Michel Trivi <jmtrivi@google.com> 1601426195 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601426195 +0000

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

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

Change-Id: I018f9d6d2563625b57d748f253573998dac342d6