Merge "Add null check for label when persisting provider info" into tm-dev am: c98cb446

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



Change-Id: I0d65b372f86d900a7ae5779999c4c5d0ca7282bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>