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

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

Change-Id: I8853bbd1b733bf1d7362fa40916350f56a3f978f