[automerger skipped] Merge "Remove extra comment" am: 6a9a35c4 -s ours am:...

[automerger skipped] Merge "Remove extra comment" am: 6a9a35c4 -s ours am: 9236dc5f -s ours am: aec47bb4 -s ours

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

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

Change-Id: I0c0daa91ef272a19c548cf55eb2f764c95f8f844