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