Merge "Fix a TODO." am: 7bbc03b467 am: 26e004398f

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

Change-Id: I55ce7a0b31564b0e6859e974bef95cc60f43e7d8