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

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

Change-Id: I466cec4fcb5b63f6b3afa35a69a8bfbd4828766b