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