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