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