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

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

Change-Id: I2b60b93f7ea1cda64bf983b48f54705f9cf475df
Signed-off-by: Automerger Merge Worker <[email protected]>