Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3148096 Change-Id: I8606fde889c1378d23fd87a23522d558d1cf639b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>