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