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