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