Merge "[TNU09] Adjust restricted notification" am: 3db6cae8d4 am: 19575361f2 am: be2d888a81

Change-Id: Ibe4dc0b517a55b52707960d2071509d81660b047