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