[automerger skipped] Add BARRING_TYPE_UNKNOWN to BarringInfoTest am:...
[automerger skipped] Add BARRING_TYPE_UNKNOWN to BarringInfoTest am: 144a57ad am: ed1a5626 -s ours
am skip reason: Change-Id Id675bdb52544a1604023d6b6b32324b148defc1f with SHA-1 f4dd1542 is in history
Change-Id: I51dcb8e6f841192630980423f43d6d603425488a