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