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