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