Merge "Merge "Set pending client to null after timeout resumes" into rvc-dev am: a0222398c5 am: d13a097137" into rvc-d1-dev-plus-aosp am: 4c8092bcad

Change-Id: I96935613b42d2d3264c3aa9ad0fb92300244a98b