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