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