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