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