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