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