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