[automerger skipped] Merge "Remove TODO(b/347269120)s as they will no longer...

[automerger skipped] Merge "Remove TODO(b/347269120)s as they will no longer be done" into main am: 7846e2fc -s ours am: ab8afbe8 -s ours

am skip reason: Merged-In Ibeb0380f8d14ebb9a4c05f7b9a26632e38affd2f with SHA-1 a8ad2ced is already in history

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



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