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