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