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