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