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