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