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

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

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



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