Merge "Fixups for Barring Info" am: 84e81127 am: 04e59a1d am: 92c32868

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



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