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