Revert "Revert "Adjust allowed messages list""
Revert "Revert "Adjust allowed messages list""

This reverts commit b53831fc8d143da13b0f688579cd1d4e494e3df7.

Reason for revert: reland, even better now!

Change-Id: Iaf08bec97e917a992100442278b49398458015e9

androidx/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,androidx/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx