Merge "NFC: Refactor a string so we can add a comment to it." am: ad8e4d2a7e

Original change: https://android-review.googlesource.com/c/platform/development/+/1667709

Change-Id: Ibb03a67ce931da6a35ae692ce03ea8c57a49bb0a