[automerger skipped] Merge changes from topics "barring-cp", "nri-rplmn" am: 2ea0b56cff am: 222c446e82 -s ours

am skip reason: Change-Id Ib38e72a6bdbaf4e1fd439e92f835daa6f87ceb73 with SHA-1 2fb0bc50f9 is in history

Change-Id: Ic955d8c6f2b5fa606a9f7477f62b232e84910de8