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