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