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