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

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



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