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