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