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