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