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