Merge "Fix the memory leak caused by the accessibility menu in SystemUI" into main am: 4f490c581c

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

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