Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324 Change-Id: I5c0984812887556ab197f4a8e06683faca6cfbf3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: