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