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