Merge "Fix freeze when Chrome multi instance split" into tm-qpr-dev am: 38abc88cc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20923908

Change-Id: Ic4512b1feb9c55cd9f952478831c470dd4f78afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>