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