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