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

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

Change-Id: I43c720d200ab8254d9652a3c77d18c5b2a84bc34