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
am: 56551f050c  -s ours

Change-Id: I03bce7915b5d008e0c4624ad66b09424d7b70a79