Merge "Amend the log for Settings.java" into main am: dfa40390 am: f17fd2d1

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



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