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

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



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