Merge "Remove TODO(b/217788708)" into tm-dev am: 1408bbe9 am: 9f34d5f1

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



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