Merge "Merge "Merge "DO NOT MERGE: Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: 244e7d3556  -s ours" into nougat-cts-dev am: 8de6ec43d2  -s ours" into nougat-mr1-cts-dev