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