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