Add guards for restoreInstanceState (issue 11982812)

Change-Id: Ic4c632a956130ab28843085490dc1badb39b0e8c
2 files changed