Merge "Merge "Disconnect plugins on the main thread." into rvc-dev am:...
Merge "Merge "Disconnect plugins on the main thread." into rvc-dev am: bb4a7486 am: 5b07edb0 am: 4d6b3ff3" into rvc-qpr-dev-plus-aosp am: 6e4d1a6c
Change-Id: I52c46f34c6f75775a5401516e776cdd246a56d68