Merge "Merge "Re-apply local client state when leash changes" into rvc-dev am: 9c50a64e91 am: 125072dce1" into rvc-d1-dev-plus-aosp am: 6905b06ad2
Change-Id: Id8654b2d8e0fcef0640b0ecd8c0fc853e705679b
This commit is contained in: