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