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