Merge "cleanup messages allow list" into main am: b54da2d7cd am: 0f2a6980b6

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

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