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