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

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

Change-Id: I92ee9481dc83e540253059490f524677c38a2626