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