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