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