Merge "correct the comments information for settings" am: 85563e7a am:...

Merge "correct the comments information for settings" am: 85563e7a am: 2977523d am: fe85cf44 am: 330ec195

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



Change-Id: I3e89d1894cea9f89a72ff9507e2a11c9ecb2c63f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>