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