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