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