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