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