Merge "Fix a TODO." am: 7bbc03b467

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

Change-Id: I58efe7c2f49d1c463026572c5eabad0f55c6a7e2