[automerger skipped] Merge "Remove extra comment" am: be83a4afc5 -s ours am: 3414a57e61 -s ours am: 516d3b7c75 -s ours

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

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

Change-Id: I0c0daa91ef272a19c548cf55eb2f764c95f8f844
tree: 34b7e3bf5fb16c568c0bf8be12663cf3170da678
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS