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

Change-Id: I265eb86dc1e808809e41ea737e44c7fa9db67a24