Merge "Test for retained fragment with a parent in the backstack" into oc-dev am: 93de478362
am: a52efe4af4

Change-Id: I7c420768065485ef89deb2d062a527bf28e6b01d