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

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

Change-Id: I8373ec481b8a8aaeeb5e69f4d609272374bdbeee