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