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