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