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