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