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