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