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: Ib5140222c3e6c5610c639f7a522c30df24412687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>