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