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