Merge "Fix the comments from aosp/1717479." into sc-dev am: e39eddcafb

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

Change-Id: Ifc6bb7eb8af7f0acce053411603c6ca6162b7e3a