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