Merge "Ensure prediction can remove from RESTRICTED timeout." into rvc-dev am: 493498d7 am: dda82699 Change-Id: Id93b03865b059dc8384d2addf22ff28e9abcceae