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