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