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