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

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



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