Merge "Remove TODO(b/347672184) and explain why @Nullable is not used" into...

Merge "Remove TODO(b/347672184) and explain why @Nullable is not used" into main am: f8a9a6f8 am: f9525bd3

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



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