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