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