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