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