[automerger skipped] Merge "Remove extra comment" am: 6a9a35c438 -s ours am: 9236dc5feb -s ours

am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 4e8639649a is already in history

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

Change-Id: Iefe558673fff3558f68d7e627ea55e64252d5ebd