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