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