Save FragmentManagerNonConfig during onSaveInstanceState()

Bug 36815706

onSaveInstanceState() is called prior to onStop(), but
onRetainNonConfigInstance() is called after. When a
retained instance fragment is added during onStop(),
the state of the two configurations won't match. This
CL moves the non-configuration save to happen immediately
after the save instance state.

Support Lib Change: Ib41cbe02d060d3411e32d1494525e119d0c23dd7
Test: I30e598abf7faceac3294aef1ee0ee3b07d3aa7c6

Change-Id: I861629e2c6da2d8b0e075e8283b631fdf80670c0