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