[automerger skipped] Merge "Fix the comments from aosp/1717479." into sc-dev am: e39eddcafb -s ours

am skip reason: Merged-In I71ebdd011574bd96de16a4248b0e15636418e87c with SHA-1 9fd7f864f4 is already in history

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

Change-Id: Id83bb07c1fb58995581d335968c7fb39abf7ffcb
tree: 7dbc54f05979f09c6d8b95dfb56a44db78f3c5d2
  1. core/
  2. services/