Merge "Merge "Re-apply local client state when leash changes" into rvc-dev am:...
Merge "Merge "Re-apply local client state when leash changes" into rvc-dev am: 9c50a64e am: 125072dc" into rvc-d1-dev-plus-aosp am: 6905b06a am: f539f320
Change-Id: Ic5185b9a71e2a3b019c2e16fd9fb8e60541050af