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