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