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