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