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

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

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

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