[automerger skipped] Add a BARRING_TYPE_UNKNOWN for Unreported Barring am:...
[automerger skipped] Add a BARRING_TYPE_UNKNOWN for Unreported Barring am: 3c5e57cd am: 5fa0fade -s ours am: 2aeb977f -s ours
am skip reason: Change-Id Ie9314c5612536bf181a3c0e52876b1804ed7cce2 with SHA-1 d5b9cc73 is in history
Change-Id: I7d7c308b329afc385ef73d7a70ec0cf8872845d1