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