[automerger] Handling activity recreate due to configuration changes in the middle of the long fling am: 16593d7932

Change-Id: Ie6a4c72829d7463c9c9c9db79b7e020db4fb967b