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