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