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