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