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