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