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