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