Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125

Change-Id: Ib61081d69ac69146a658beeddb5e70ba1f4210eb