Merge "Merge "Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: ffe8423f" into nougat-cts-dev