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