Merge "Remove obsolete TODO" into tm-qpr-dev am: 48648d3a am: f727cc0c

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



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