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