[automerger skipped] Sync MT slots on reset and buffer overflow am: cb7de996 -s ours

am skip reason: Merged-In I8195406ce1f9e3e704381b47e282c65463537745 with SHA-1 4b4a457f is already in history

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



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