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