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