Merge "Generating Provider Status Enum Consistently" into udc-dev am: d3d4df33

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



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