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