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