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