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